From: Luca Boccassi <bluca@debian.org>
Date: Wed, 11 May 2022 11:24:10 +0000 (+0100)
Subject: [PATCH] test: ignore LXC filesystem when checking for writable locations
X-Git-Tag: archive/raspbian/247.3-7+rpi1+deb11u8^2~9
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/%22mailto:kde%40ewsoftware.de/%22style.css/%22node%24level1.html//%22Programmet/%22http:/www.example.com/%22mailto:kde%40ewsoftware.de/%22style.css/%22node%24level1.html/%22Programmet?a=commitdiff_plain;h=4f8ca298d99319f84a142195a2639eb8bb3142f4;p=systemd.git

[PATCH] test: ignore LXC filesystem when checking for writable locations

test-execute checks that only /var/lib/private/waldo is writable, but there are
some filesystems that are always writable and excluded. Add /sys/devices/system/cpu
which is created by lxcfs.

Fixes https://github.com/systemd/systemd/issues/23263

Origin: upstream, https://github.com/systemd/systemd/commit/646cba5c4208c28c56dbe52d676ab1a176c69b7f

Gbp-Pq: Name test-ignore-LXC-filesystem-when-checking-for-writable-loc.patch
---

diff --git a/test/test-execute/exec-dynamicuser-statedir.service b/test/test-execute/exec-dynamicuser-statedir.service
index 6103193b..c483f36e 100644
--- a/test/test-execute/exec-dynamicuser-statedir.service
+++ b/test/test-execute/exec-dynamicuser-statedir.service
@@ -13,7 +13,7 @@ ExecStart=test -f /var/lib/private/quux/pief/yayyay
 ExecStart=sh -x -c 'test "$$STATE_DIRECTORY" = "%S/waldo:%S/quux/pief"'
 
 # Make sure that /var/lib/private/waldo is really the only writable directory besides the obvious candidates
-ExecStart=sh -x -c 'test $$(find / \\( -path /var/tmp -o -path /tmp -o -path /proc -o -path /dev/mqueue -o -path /dev/shm -o -path /sys/fs/bpf -o -path /dev/.lxc \\) -prune -o -type d -writable -print 2>/dev/null | sort -u | tr -d "\\\\n") = /var/lib/private/quux/pief/var/lib/private/waldo'
+ExecStart=sh -x -c 'test $$(find / \\( -path /var/tmp -o -path /tmp -o -path /proc -o -path /dev/mqueue -o -path /dev/shm -o -path /sys/fs/bpf -o -path /dev/.lxc -o -path /sys/devices/system/cpu \\) -prune -o -type d -writable -print 2>/dev/null | sort -u | tr -d "\\\\n") = /var/lib/private/quux/pief/var/lib/private/waldo'
 
 Type=oneshot
 DynamicUser=yes